Remove confusion over XI2 defines

Some places were using XINPUT_2, others XINPUT_XI2. Since configure
defines XINPUT_2, use that throughout.

diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index 7622fec3e01d64bcc03a16d69d81adcb70e60b54..b6c02552a84ba7e7eb5d88079f2d736de584cd70 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -749,7 +749,7 @@ _gdk_x11_device_xi2_translate_state (XIModifierState *mods_state,
   return state;
 }
 
-#else /* XINPUT_XI2 */
+#else /* XINPUT_2 */
 
 static void
 gdk_x11_device_xi2_class_init (GdkX11DeviceXI2Class *klass)
@@ -761,4 +761,4 @@ gdk_x11_device_xi2_init (GdkX11DeviceXI2 *device)
 {
 }
 
-#endif /* XINPUT_XI2 */
+#endif /* XINPUT_2 */

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 40b989ba7f1fbc658144a4bf9c01b98e71fcf671..7c93bbba06ded83576e9ef7328fd90cc2e8713fa 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -30,7 +30,7 @@
 #include "gdkintl.h"
 #include "gdkkeysyms.h"
 
-#ifdef XINPUT_XI2
+#ifdef XINPUT_2
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -38,7 +38,7 @@
 
 #include <string.h>
 
-#endif /* XINPUT_XI2 */
+#endif /* XINPUT_2 */
 
 struct _GdkX11DeviceManagerXI2
 {
@@ -63,7 +63,7 @@ G_DEFINE_TYPE_WITH_CODE (GdkX11DeviceManagerXI2, gdk_x11_device_manager_xi2, GDK
                                                 gdk_x11_device_manager_xi2_event_translator_init))
 
 
-#ifdef XINPUT_XI2
+#ifdef XINPUT_2
 
 #define HAS_FOCUS(toplevel) ((toplevel)->has_focus || (toplevel)->has_pointer_focus)
 
@@ -1308,7 +1308,7 @@ gdk_x11_device_manager_xi2_select_window_events (GdkEventTranslator *translator,
   g_free (event_mask.mask);
 }
 
-#else /* XINPUT_XI2 */
+#else /* XINPUT_2 */
 
 static void
 gdk_x11_device_manager_xi2_class_init (GdkX11DeviceManagerXI2Class *klass)
@@ -1325,4 +1325,4 @@ gdk_x11_device_manager_xi2_event_translator_init (GdkEventTranslatorIface *iface
 {
 }
 
-#endif /* XINPUT_XI2 */
+#endif /* XINPUT_2 */

diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 5a60f8880d250f9de7dc852d073b68113367ce01..2df20583c5e84e5b962661279c685bc7f045cc60 100644 (file)
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -44,7 +44,7 @@
 #ifdef XINPUT_XFREE
 #include <X11/extensions/XInput.h>
 #endif
-#ifdef XINPUT_XI2
+#ifdef XINPUT_2
 #include <X11/extensions/XInput2.h>
 #endif
 
@@ -244,7 +244,7 @@ void _gdk_x11_device_xi_translate_axes     (GdkDevice *device,
                                             gdouble   *y);
 #endif
 
-#ifdef XINPUT_XI2
+#ifdef XINPUT_2
 guchar * _gdk_x11_device_xi2_translate_event_mask (GdkEventMask     event_mask,
                                                    gint            *len);
 guint    _gdk_x11_device_xi2_translate_state      (XIModifierState *mods_state,